Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/signup with provider page #6888

Merged
merged 1 commit into from
Aug 6, 2024
Merged

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Jul 8, 2024

No description provided.

@mgallien mgallien requested review from camilasan and claucambra July 8, 2024 16:49
@mgallien
Copy link
Collaborator Author

mgallien commented Jul 8, 2024

/backport to stable-3.13

@mgallien
Copy link
Collaborator Author

mgallien commented Jul 8, 2024

/backport to stable-3.12

@mgallien mgallien force-pushed the bugfix/signupWithProviderPage branch from f42e21f to 4bbc1f0 Compare July 8, 2024 16:50
@mgallien mgallien enabled auto-merge July 9, 2024 15:35
@mgallien mgallien force-pushed the bugfix/signupWithProviderPage branch from 4bbc1f0 to 4a981fd Compare July 9, 2024 15:35
@mgallien mgallien force-pushed the bugfix/signupWithProviderPage branch from 4a981fd to 572fec8 Compare July 30, 2024 09:24
@mgallien mgallien disabled auto-merge August 6, 2024 16:21
@mgallien mgallien force-pushed the bugfix/signupWithProviderPage branch from 572fec8 to 156ab80 Compare August 6, 2024 16:21
@mgallien mgallien merged commit 73fe5ab into master Aug 6, 2024
11 of 14 checks passed
@mgallien mgallien deleted the bugfix/signupWithProviderPage branch August 6, 2024 16:21
Copy link

backportbot bot commented Aug 6, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6888/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 156ab805

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6888/stable-3.12

Error: Failed to clone repository: Failed to checkout branches: error: Your local changes to the following files would be overwritten by checkout:
src/gui/macOS/ClientCommunicationProtocol.h
Please commit your changes or stash them before you switch branches.
Aborting


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6888-156ab805f2b33bce162353786677d00876af2db8-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copy link

sonarqubecloud bot commented Aug 6, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants